[coastguard skipped] Merge sparse cherrypicks from sparse-10817346-L96600000963063472 into udc-release. am: ba75b03b43 Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24777525 Change-Id: Ibd35713e6d117e7ada36b3c13bce305084c66b23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>